chore: bump CAPI to v1.6.x #1115

damdo · 2024-01-22T10:55:52Z

What type of PR is this?

What this PR does / why we need it:

This bumps main to use v1.6.1 of CAPI. It also bumps to use Go v1.21 and controller-runtime v0.16.3.

NOTES:
Note for the reviewers: the apidiff is failing because I removed (the already deprecated) v1alpha3 as that has been deprecated by the core cluster-api project in 1.6.x and we depended on that in CAPG /api/v1alpha3.

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Bump CAPI to v1.6.x (and associated packages)

cpanato

/ok-to-test
/assign

damdo · 2024-01-22T11:28:40Z

@cpanato do we need to bump https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-presubmits-main.yaml for the verify job to pick up go 1.21 ? https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1115/pull-cluster-api-provider-gcp-verify/1749389568546705408

cpanato · 2024-01-22T11:40:31Z

@cpanato do we need to bump https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-presubmits-main.yaml for the verify job to pick up go 1.21 ? https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1115/pull-cluster-api-provider-gcp-verify/1749389568546705408

yes, can you do that?

damdo · 2024-01-22T12:01:23Z

@cpanato like so? kubernetes/test-infra#31690

damdo · 2024-01-22T12:33:20Z

/retest

damdo · 2024-01-22T13:09:09Z

@cpanato looks like that didn't help much

cpanato · 2024-01-22T13:10:48Z

i will take a look this week

damdo · 2024-01-22T13:50:59Z

It looks like that's because even the 1.28 image uses go 1.20.x

$ docker run --rm -it --entrypoint=/bin/bash gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240111-cf1d81388e-1.28
root@c04a6e08bc89:/workspace# go version
go version go1.20.13 linux/amd64

https://github.com/kubernetes/test-infra/blob/7bbc8c4e93f30230ca0200ede47e6e88033d9385/images/kubekins-e2e/variants.yaml#L42

@cpanato Maybe we should try using the 1.29 one, which uses GO_VERSION: 1.21.6?

damdo · 2024-01-22T14:09:12Z

It looks like using 1.29 images is what CAPA is also doing for CAPI 1.6.x.
@cpanato I opened kubernetes/test-infra#31691 to use those for CAPG as well, PTAL.

damdo · 2024-01-22T14:33:39Z

/retest

damdo · 2024-01-23T14:06:33Z

Hit rate limit
/test pull-cluster-api-provider-gcp-e2e-test

damdo · 2024-01-23T14:40:11Z

Hmm deployment "capg-controller-manager" is not ready after 5m0s it looks like the CAPG manager deployment is not coming up correctly.
It'd be nice to be able to check the pod logs/events.
Is there a way to do so @cpanato ? Thanks!

damdo · 2024-01-24T17:06:13Z

/test ?

k8s-ci-robot · 2024-01-24T17:06:16Z

@damdo: The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-gcp-build
/test pull-cluster-api-provider-gcp-e2e-test
/test pull-cluster-api-provider-gcp-make
/test pull-cluster-api-provider-gcp-test
/test pull-cluster-api-provider-gcp-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-gcp-apidiff
/test pull-cluster-api-provider-gcp-capi-e2e
/test pull-cluster-api-provider-gcp-conformance
/test pull-cluster-api-provider-gcp-conformance-ci-artifacts
/test pull-cluster-api-provider-gcp-coverage
/test pull-cluster-api-provider-gcp-coverage-release-1-4
/test pull-cluster-api-provider-gcp-coverage-release-1-5
/test pull-cluster-api-provider-gcp-e2e-workload-upgrade

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-gcp-apidiff
pull-cluster-api-provider-gcp-build
pull-cluster-api-provider-gcp-e2e-test
pull-cluster-api-provider-gcp-make
pull-cluster-api-provider-gcp-test
pull-cluster-api-provider-gcp-verify

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

vincepri · 2024-01-26T19:07:22Z

cloud/scope/machine.go

 	if err != nil {
 		return nil
 	}

-	return pointer.String(parsed.ID()) //nolint: staticcheck
+	return ptr.To[string](parsed.ID()) //nolint: staticcheck


Suggested change

return ptr.To[string](parsed.ID()) //nolint: staticcheck

return ptr.To(parsed.ID()) //nolint: staticcheck

All of these aren't needed, they're implicit

Yeah you are right, although it's nice to have typing assertion there. I think it might be worth keeping them

damdo · 2024-01-31T14:44:40Z

@cpanato @vincepri @richardcase I ran E2Es locally, found the issue and fixed them 🎉
This is ready for labelling now. Thanks!

damdo · 2024-01-31T14:47:34Z

Note for the reviewers: the apidiff is failing because I removed (the already deprecated) v1alpha3 as that has been deprecated by the core cluster-api project in 1.6.x and we depended on that in CAPG /api/v1alpha3.

cpanato · 2024-01-31T16:36:08Z

/test ls

k8s-ci-robot · 2024-01-31T16:36:10Z

@cpanato: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-gcp-build
/test pull-cluster-api-provider-gcp-e2e-test
/test pull-cluster-api-provider-gcp-make
/test pull-cluster-api-provider-gcp-test
/test pull-cluster-api-provider-gcp-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-gcp-apidiff
/test pull-cluster-api-provider-gcp-capi-e2e
/test pull-cluster-api-provider-gcp-conformance
/test pull-cluster-api-provider-gcp-conformance-ci-artifacts
/test pull-cluster-api-provider-gcp-coverage
/test pull-cluster-api-provider-gcp-coverage-release-1-4
/test pull-cluster-api-provider-gcp-coverage-release-1-5
/test pull-cluster-api-provider-gcp-e2e-workload-upgrade

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-gcp-apidiff
pull-cluster-api-provider-gcp-build
pull-cluster-api-provider-gcp-e2e-test
pull-cluster-api-provider-gcp-make
pull-cluster-api-provider-gcp-test
pull-cluster-api-provider-gcp-verify

In response to this:

/test ls

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

cpanato · 2024-01-31T16:36:16Z

/test pull-cluster-api-provider-gcp-conformance

cpanato · 2024-01-31T16:36:43Z

@cpanato @vincepri @richardcase I ran E2Es locally, found the issue and fixed them 🎉 This is ready for labelling now. Thanks!

cool great job!!!

cpanato · 2024-01-31T17:33:00Z

/test pull-cluster-api-provider-gcp-capi-e2e

damdo · 2024-01-31T21:33:42Z

/test pull-cluster-api-provider-gcp-capi-e2e

k8s-ci-robot · 2024-01-31T21:52:44Z

@damdo: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-gcp-apidiff	`d067593`	link	false	`/test pull-cluster-api-provider-gcp-apidiff`
pull-cluster-api-provider-gcp-capi-e2e	`d067593`	link	false	`/test pull-cluster-api-provider-gcp-capi-e2e`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

damdo · 2024-02-01T10:00:42Z

@cpanato to check whether pull-cluster-api-provider-gcp-capi-e2e has been broken by this PR, or already was before, I opened a No-op PR to check it here

EDIT: it looks like it fails on "main" with the same issue, hence unrelated to this PR.

damdo · 2024-02-01T10:33:23Z

@cpanato updated the comment above with the results of my test

cpanato · 2024-02-02T07:32:18Z

I see, thanks for the investigation, lets move forward with this one and try to fix that test in a follow up, and then after that we can cut a release

thanks so much for working on this

/approve
/lgtm

k8s-ci-robot · 2024-02-02T07:32:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, damdo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [cpanato]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 22, 2024

k8s-ci-robot requested review from dims and richardcase January 22, 2024 10:55

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 22, 2024

cpanato reviewed Jan 22, 2024

View reviewed changes

k8s-ci-robot assigned cpanato Jan 22, 2024

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 22, 2024

damdo force-pushed the bump-capi-1.6.x branch from 44203ba to eff694b Compare January 22, 2024 11:12

damdo mentioned this pull request Jan 22, 2024

Bump CAPG to use k8s 1.29 kubernetes/test-infra#31691

Merged

damdo force-pushed the bump-capi-1.6.x branch 6 times, most recently from 2c95dd9 to ee3aba2 Compare January 23, 2024 13:36

vincepri reviewed Jan 26, 2024

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 30, 2024

damdo added 4 commits January 30, 2024 11:23

use k8s.io/utils/ptr instead of pointer

ef302eb

capi 1.6.x: bump tools files

8c515df

capi 1.6.x: bump test environment

b769f2d

capi 1.6.x: remove v1alpha3

241896e

damdo force-pushed the bump-capi-1.6.x branch from 2249c21 to 96fff48 Compare January 30, 2024 10:28

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 30, 2024

damdo force-pushed the bump-capi-1.6.x branch from 96fff48 to 38a2eba Compare January 31, 2024 12:12

capi 1.6.x: add copy of providerid

d067593

damdo force-pushed the bump-capi-1.6.x branch from 38a2eba to d067593 Compare January 31, 2024 14:18

damdo requested review from cpanato and vincepri January 31, 2024 15:39

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 2, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 2, 2024

k8s-ci-robot merged commit 0d60ffb into kubernetes-sigs:main Feb 2, 2024
15 of 17 checks passed

k8s-ci-robot added this to the v1.1.0 milestone Feb 2, 2024

damdo mentioned this pull request Feb 2, 2024

⚠️ Remove v1alpha4 API types #1120

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump CAPI to v1.6.x #1115

chore: bump CAPI to v1.6.x #1115

damdo commented Jan 22, 2024 •

edited

Loading

cpanato left a comment

damdo commented Jan 22, 2024

cpanato commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

cpanato commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 23, 2024

damdo commented Jan 23, 2024

damdo commented Jan 24, 2024

k8s-ci-robot commented Jan 24, 2024

vincepri Jan 26, 2024

damdo Jan 29, 2024

damdo commented Jan 31, 2024

damdo commented Jan 31, 2024

cpanato commented Jan 31, 2024

k8s-ci-robot commented Jan 31, 2024

cpanato commented Jan 31, 2024

cpanato commented Jan 31, 2024

cpanato commented Jan 31, 2024

damdo commented Jan 31, 2024

k8s-ci-robot commented Jan 31, 2024

damdo commented Feb 1, 2024 •

edited

Loading

damdo commented Feb 1, 2024

cpanato commented Feb 2, 2024

k8s-ci-robot commented Feb 2, 2024

	return ptr.To[string](parsed.ID()) //nolint: staticcheck
	return ptr.To(parsed.ID()) //nolint: staticcheck

chore: bump CAPI to v1.6.x #1115

chore: bump CAPI to v1.6.x #1115

Conversation

damdo commented Jan 22, 2024 • edited Loading

cpanato left a comment

Choose a reason for hiding this comment

damdo commented Jan 22, 2024

cpanato commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

cpanato commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 22, 2024

damdo commented Jan 23, 2024

damdo commented Jan 23, 2024

damdo commented Jan 24, 2024

k8s-ci-robot commented Jan 24, 2024

vincepri Jan 26, 2024

Choose a reason for hiding this comment

damdo Jan 29, 2024

Choose a reason for hiding this comment

damdo commented Jan 31, 2024

damdo commented Jan 31, 2024

cpanato commented Jan 31, 2024

k8s-ci-robot commented Jan 31, 2024

cpanato commented Jan 31, 2024

cpanato commented Jan 31, 2024

cpanato commented Jan 31, 2024

damdo commented Jan 31, 2024

k8s-ci-robot commented Jan 31, 2024

damdo commented Feb 1, 2024 • edited Loading

damdo commented Feb 1, 2024

cpanato commented Feb 2, 2024

k8s-ci-robot commented Feb 2, 2024

damdo commented Jan 22, 2024 •

edited

Loading

damdo commented Feb 1, 2024 •

edited

Loading